bitkeeper revision 1.1668.1.9 (42a8b831tFH6fPqu6A9bd_8WkrQHxg)

sn2 console patch
Signed-off-by: Greg Edwards <edwardsg@sgi.com>

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index d323f407c510d1c3883cb59682d1decec426b6b9..2e59a7d19d5820d7fdd67a13520ca7d287ef4fdd 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -9,7 +9,8 @@ OBJS = xensetup.o setup.o time.o irq.o ia64_ksyms.o process.o smp.o \
        xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
        extable.o linuxextable.o xenirq.o xentime.o \
        regionreg.o entry.o unaligned.o privop.o vcpu.o \
-       irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o
+       irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
+       sn_console.o
 
 ifeq ($(CONFIG_VTI),y)
 OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o \

diff --git a/xen/arch/ia64/acpi.c b/xen/arch/ia64/acpi.c
index 39ae5fe9864164d52c9d4d89c17038960b3a92a4..6dbc687b8b15950ac1a63e2b4b8ded60e1656118 100644 (file)
--- a/xen/arch/ia64/acpi.c
+++ b/xen/arch/ia64/acpi.c
@@ -68,7 +68,7 @@ unsigned char acpi_legacy_devices;
 const char *
 acpi_get_sysname (void)
 {
-#ifdef CONFIG_IA64_GENERIC
+/* #ifdef CONFIG_IA64_GENERIC */
        unsigned long rsdp_phys;
        struct acpi20_table_rsdp *rsdp;
        struct acpi_table_xsdt *xsdt;
@@ -101,6 +101,7 @@ acpi_get_sysname (void)
        }
 
        return "dig";
+/*
 #else
 # if defined (CONFIG_IA64_HP_SIM)
        return "hpsim";
@@ -114,6 +115,7 @@ acpi_get_sysname (void)
 #      error Unknown platform.  Fix acpi.c.
 # endif
 #endif
+*/
 }
 
 #ifdef CONFIG_ACPI_BOOT

diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
index e1d373f545ce86c43bbb1cabcea5874e5adefa27..5964c836c8ae6dc1b1d1c6f69b280b18f5557966 100644 (file)
--- a/xen/arch/ia64/tools/mkbuildtree
+++ b/xen/arch/ia64/tools/mkbuildtree
@@ -45,6 +45,7 @@ fi
 mkdir include/asm-generic
 mkdir include/asm-ia64/linux
 mkdir include/asm-ia64/linux/byteorder
+mkdir include/asm-ia64/sn
 # use "gcc -Iinclude/asm-ia64" to find these linux includes
 #ln -s $XEN/include/xen $XEN/include/linux
 #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
@@ -198,6 +199,12 @@ null include/asm-ia64/module.h
 null include/asm-ia64/ia32.h
 null include/asm-ia64/tlbflush.h
 
+null include/asm-ia64/sn/arch.h
+null include/asm-ia64/sn/geo.h
+null include/asm-ia64/sn/nodepda.h
+null include/asm-ia64/sn/sn_cpuid.h
+cp_patch include/asm-ia64/sn/sn_sal.h include/asm-ia64/sn/sn_sal.h sn_sal.h
+
 softlink include/asm-ia64/acpi.h include/asm-ia64/acpi.h
 softlink include/asm-ia64/asmmacro.h include/asm-ia64/asmmacro.h
 softlink include/asm-ia64/atomic.h include/asm-ia64/atomic.h

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index f0e556f69bc92ddd07e9df6e2bb296c481eb4a0c..2b6a00a9052a553b283b28720235612acf0c162b 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -19,6 +19,7 @@
 #define        CONFIG_IA64_GRANULE_16MB
 
 #define CONFIG_EFI_PCDP
+#define CONFIG_SERIAL_SGI_L1_CONSOLE
 
 #ifndef __ASSEMBLY__